Include ZWJs and ZWNJs for all Indic scripts.

diff --git a/debian/changelog b/debian/changelog
index 4d4507fdca6205054415b6f90719718dfca3606d..0e0108458d9eb767a8a584ef5aeacee6886317b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,11 @@ emacs23 (23.1+1-7) unstable; urgency=low
     the report and Sven Joachim <svenjoac@gmx.de> for tracking down
     the patch. (closes: #560573)
 
- -- Rob Browning <rlb@defaultvalue.org>  Thu, 21 Jan 2010 21:51:45 -0800
+  * Apply an upstream patch to include ZWJs and ZWNJs for all Indic
+    scripts.  Thanks to Praveen A <pravi.a@gmail.com> for the
+    report. (closes: #559292)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue, 26 Jan 2010 22:11:56 -0800
 
 emacs23 (23.1+1-6) unstable; urgency=low
 

diff --git a/debian/patches/series b/debian/patches/series
index 0923459622a2f392f2a26f49e29756313468fdaf..849a262fdafa873421473b16a5e00abf3d766466 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,5 @@ fix-flymake-xmlstarlet-invocation.diff
 fix-rmail-capitalized-month-names.diff
 fix-dynamic-menus.diff
 fix-gtk-scroll-bar-events.diff
+use-zwj-and-zwnj-for-indic-scripts.diff
 autofiles.diff

diff --git a/debian/patches/use-zwj-and-zwnj-for-indic-scripts.diff b/debian/patches/use-zwj-and-zwnj-for-indic-scripts.diff
new file mode 100644 (file)
index 0000000..c2afff0
--- /dev/null
+++ b/debian/patches/use-zwj-and-zwnj-for-indic-scripts.diff
@@ -0,0 +1,39 @@
+* Emacs should now include ZWJs and ZWNJs for all Indic scripts.
+  Patch: use-zwj-and-zwnj-for-indic-scripts.diff
+  Originally-reported-by: Praveen A <pravi.a@gmail.com>
+  Date: Thu, 3 Dec 2009 11:51:02 UTC
+  Added-by: Rob Browning <rlb@defaultvalue.org>
+  Status: incorporated upstream
+  Bug: 559292
+
+  The Debian patch is taken from this upstream commit:
+
+    From f0c7c513b71778e3767be145334e20872f6c68be Mon Sep 17 00:00:00 2001
+    From: Kenichi Handa <handa@m17n.org>
+    Date: Wed, 2 Dec 2009 07:59:51 +0000
+    Subject: [PATCH] Include ZWJ and ZWNJ in the patterns to shape for all Indic scripts.
+
+Index: b/lisp/language/indian.el
+===================================================================
+--- a/lisp/language/indian.el
++++ b/lisp/language/indian.el
+@@ -165,15 +165,15 @@
+   "Regexp matching a composable sequence of Malayalam characters.")
+ 
+ (let ((script-regexp-alist
+-       `((devanagari . ,devanagari-composable-pattern)
++       `((devanagari . "[\x900-\x97F\x200C\x200D]+")
+        (bengali . "[\x980-\x9FF\x200C\x200D]+")
+        (gurmukhi . "[\xA00-\xA7F\x200C\x200D]+")
+        (gujarati . "[\xA80-\xAFF\x200C\x200D]+")
+        (oriya . "[\xB00-\xB7F\x200C\x200D]+")
+-       (tamil . ,tamil-composable-pattern)
++       (tamil . "[\xB80-\xBFF\x200C\x200D]+")
+        (telugu . "[\xC00-\xC7F\x200C\x200D]+")
+-       (kannada . ,kannada-composable-pattern)
+-       (malayalam . ,malayalam-composable-pattern))))
++       (kannada . "[\xC80-\xCFF\x200C\x200D]+")
++       (malayalam . "[\xD00-\xD7F\x200C\x200D]+"))))
+   (map-char-table
+    #'(lambda (key val)
+        (let ((slot (assq val script-regexp-alist)))